From: Eli Zaretskii Date: Fri, 14 May 2010 09:02:50 +0000 (+0300) Subject: Fix spelling and remove merge marks due to revno 100276. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7767 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7cb00303bf694185e52e96186bfeee77f528e7c3;p=emacs.git Fix spelling and remove merge marks due to revno 100276. --- diff --git a/src/ChangeLog b/src/ChangeLog index a53f3b26fb4..500dc79954c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -6,7 +6,7 @@ ENDPOS < CHARPOS. (composition_reseat_it): Handle the case that ENDPOS < CHARPOS. Set CMP_IT->reversed_p. - (composition_update_it): Pay attention ot CMP_IT->reversed_p. + (composition_update_it): Pay attention to CMP_IT->reversed_p. * xdisp.c (set_iterator_to_next): Call composition_compute_stop_pos with negative ENDPOS if we are @@ -102,7 +102,6 @@ * xdisp.c (init_iterator): Don't turn on bidi reordering in unibyte buffers. See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html. ->>>>>>> MERGE-SOURCE 2010-05-10 Glenn Morris